Link .mli files corresponding to autorgenerated .ml files into builddir
authorHilko Bengen <bengen@debian.org>
Mon, 13 Jan 2020 19:13:30 +0000 (20:13 +0100)
committerHilko Bengen <bengen@debian.org>
Thu, 23 Jan 2020 14:10:24 +0000 (14:10 +0000)
This avoids build failures in separate builds such as this one:

,----
| ocamlfind ocamlc -package str,unix -I . -a guestfs_config.cmo stringMap.cmo stringSet.cmo std_utils.cmo -o mlstdutils.cma
| ar cr libmlstdutils.a libmlstdutils_a-dummy.o
| ranlib libmlstdutils.a
| File "_none_", line 1:
| Error: Files std_utils.cmo and guestfs_config.cmo
|        make inconsistent assumptions over interface Guestfs_config
| make[4]: *** [Makefile:2580: mlstdutils.cma] Error 2
`----

Gbp-Pq: Name 0018-Link-.mli-files-corresponding-to-autorgenerated-.ml-.patch

configure.ac

index 210d5229969631ec79a58674733841cb17e92a87..49eb576b7368bd78b34a7762edcac0f2f8ab29b8 100644 (file)
@@ -373,6 +373,11 @@ AC_CONFIG_FILES([Makefile
                  v2v/test-harness/Makefile
                  v2v/test-harness/META
                  website/index.html])
+
+AC_CONFIG_LINKS([common/mlstdutils/guestfs_config.mli:common/mlstdutils/guestfs_config.mli
+                 daemon/daemon_config.mli:daemon/daemon_config.mli
+                 v2v/config.mli:v2v/config.mli])
+
 AC_OUTPUT
 
 dnl Produce summary.